Merge branch 'fix-custom-build-cross' of https://github.com/jmesmon/cargo into pr...
authorAlex Crichton <alex@alexcrichton.com>
Thu, 18 Dec 2014 00:09:33 +0000 (16:09 -0800)
committerAlex Crichton <alex@alexcrichton.com>
Thu, 18 Dec 2014 00:09:33 +0000 (16:09 -0800)

Trivial merge